From: Jasper St. Pierre <jstpierre@mecheye.net>
Date: Tue, 2 Oct 2012 23:24:56 +0000 (-0300)
Subject: messageTray: Don't animate the desktop clone for a failed tray grab
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~5673
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=7d6c85be42e34e01d85d3e1cc644ec32e43522da;p=gnome-shell.git

messageTray: Don't animate the desktop clone for a failed tray grab

If we fail to grab for the message tray, we shouldn't be animating
the desktop clone. This is a regression from commit fe124e6.

https://bugzilla.gnome.org/show_bug.cgi?id=685342
---

diff --git a/js/ui/messageTray.js b/js/ui/messageTray.js
index 9baaaeacb..8b27d3d0e 100644
--- a/js/ui/messageTray.js
+++ b/js/ui/messageTray.js
@@ -2028,7 +2028,7 @@ const MessageTray = new Lang.Class({
         let trayShouldBeVisible = (this._summaryState == State.SHOWING ||
                                    this._summaryState == State.SHOWN);
         if (!trayIsVisible && trayShouldBeVisible)
-            this._showTray();
+            trayShouldBeVisible = this._showTray();
         else if (trayIsVisible && !trayShouldBeVisible)
             this._hideTray();
 
@@ -2078,7 +2078,7 @@ const MessageTray = new Lang.Class({
                                      modal: modal,
                                      onUngrab: Lang.bind(this, this._escapeTray) })) {
             this._traySummoned = false;
-            return;
+            return false;
         }
 
         this._tween(this.actor, '_trayState', State.SHOWN,
@@ -2090,6 +2090,8 @@ const MessageTray = new Lang.Class({
         if (this._overviewVisible) {
             this._lightbox.show();
         }
+
+        return true;
     },
 
     _showDesktopClone: function() {